From b443d4d71952811624c3404158488ebfedbe99e7 Mon Sep 17 00:00:00 2001
From: aj <andrewjpack@gmail.com>
Date: Thu, 7 Jun 2018 23:43:57 +0100
Subject: [PATCH] removed unused imports, deleted copied resources

---
 .../sarsoo/fmframework/file/Persister.java    |   2 -
 .../java/sarsoo/fmframework/fx/ArtistTab.java |   2 -
 .../sarsoo/fmframework/fx/ConsoleTab.java     |   1 -
 .../fmframework/fx/FMObjListEditTab.java      |  10 --
 .../sarsoo/fmframework/fx/FMObjListTab.java   |  10 --
 .../java/sarsoo/fmframework/fx/TrackTab.java  |   2 -
 .../fx/controller/AlbumGetPaneController.java |   1 -
 .../fx/controller/AlbumPaneController.java    |  13 --
 .../fx/controller/ArtistPaneController.java   |  14 --
 .../fx/controller/ControllerMain.java         |   8 --
 .../controller/FMObjListPaneController.java   |   1 -
 .../FMObjListPaneEditController.java          |   2 -
 .../fmframework/fx/styles/FMObjListPane.css   |  46 ------
 .../sarsoo/fmframework/fx/styles/ObjPane.css  |  29 ----
 .../sarsoo/fmframework/fx/styles/mainPane.css |  18 ---
 .../sarsoo/fmframework/fx/ui/AlbumPane.fxml   | 109 ---------------
 .../sarsoo/fmframework/fx/ui/ArtistPane.fxml  |  99 -------------
 .../fmframework/fx/ui/FMObjListPane.fxml      |  58 --------
 .../fmframework/fx/ui/FMObjListPaneEdit.fxml  |  79 -----------
 .../sarsoo/fmframework/fx/ui/TrackPane.fxml   |  91 ------------
 .../fmframework/fx/ui/albumgetpane.fxml       |  24 ----
 .../java/sarsoo/fmframework/fx/ui/main.fxml   | 132 ------------------
 .../sarsoo/fmframework/fx/ui/template.fxml    |  92 ------------
 .../sarsoo/fmframework/jframe/Driver.java     |   3 -
 .../fmframework/jframe/FMObjListView.java     |   1 -
 .../fmframework/jframe/RefListsView.java      |   4 -
 .../sarsoo/fmframework/jframe/WikiView.java   |  14 --
 .../java/sarsoo/fmframework/music/Artist.java |   1 -
 .../sarsoo/fmframework/net/Authenticator.java |   2 -
 .../java/sarsoo/fmframework/net/Network.java  |   7 -
 .../sarsoo/fmframework/parser/Parser.java     |   1 -
 .../java/sarsoo/fmframework/util/Getter.java  |   2 +-
 .../java/sarsoo/fmframework/util/Maths.java   |   2 -
 33 files changed, 1 insertion(+), 879 deletions(-)
 delete mode 100644 src/main/java/sarsoo/fmframework/fx/styles/FMObjListPane.css
 delete mode 100644 src/main/java/sarsoo/fmframework/fx/styles/ObjPane.css
 delete mode 100644 src/main/java/sarsoo/fmframework/fx/styles/mainPane.css
 delete mode 100644 src/main/java/sarsoo/fmframework/fx/ui/AlbumPane.fxml
 delete mode 100644 src/main/java/sarsoo/fmframework/fx/ui/ArtistPane.fxml
 delete mode 100644 src/main/java/sarsoo/fmframework/fx/ui/FMObjListPane.fxml
 delete mode 100644 src/main/java/sarsoo/fmframework/fx/ui/FMObjListPaneEdit.fxml
 delete mode 100644 src/main/java/sarsoo/fmframework/fx/ui/TrackPane.fxml
 delete mode 100644 src/main/java/sarsoo/fmframework/fx/ui/albumgetpane.fxml
 delete mode 100644 src/main/java/sarsoo/fmframework/fx/ui/main.fxml
 delete mode 100644 src/main/java/sarsoo/fmframework/fx/ui/template.fxml

diff --git a/src/main/java/sarsoo/fmframework/file/Persister.java b/src/main/java/sarsoo/fmframework/file/Persister.java
index 1c77206..71cbb20 100644
--- a/src/main/java/sarsoo/fmframework/file/Persister.java
+++ b/src/main/java/sarsoo/fmframework/file/Persister.java
@@ -8,8 +8,6 @@ import java.io.FileOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import sarsoo.fmframework.util.FMObjList;
-
 public class Persister<T> {
 	
 	public void saveToFile(File file, T obj) {
diff --git a/src/main/java/sarsoo/fmframework/fx/ArtistTab.java b/src/main/java/sarsoo/fmframework/fx/ArtistTab.java
index 107a802..81d4ee2 100644
--- a/src/main/java/sarsoo/fmframework/fx/ArtistTab.java
+++ b/src/main/java/sarsoo/fmframework/fx/ArtistTab.java
@@ -4,9 +4,7 @@ import java.io.IOException;
 
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
-import sarsoo.fmframework.fx.controller.AlbumPaneController;
 import sarsoo.fmframework.fx.controller.ArtistPaneController;
-import sarsoo.fmframework.music.Album;
 import sarsoo.fmframework.music.Artist;
 import javafx.fxml.FXMLLoader;
 
diff --git a/src/main/java/sarsoo/fmframework/fx/ConsoleTab.java b/src/main/java/sarsoo/fmframework/fx/ConsoleTab.java
index 2110353..f2c9b11 100644
--- a/src/main/java/sarsoo/fmframework/fx/ConsoleTab.java
+++ b/src/main/java/sarsoo/fmframework/fx/ConsoleTab.java
@@ -1,7 +1,6 @@
 package sarsoo.fmframework.fx;
 
 import javafx.scene.control.Tab;
-import javafx.scene.layout.AnchorPane;
 
 public class ConsoleTab extends Tab{
 	
diff --git a/src/main/java/sarsoo/fmframework/fx/FMObjListEditTab.java b/src/main/java/sarsoo/fmframework/fx/FMObjListEditTab.java
index 975f395..56dbeb8 100644
--- a/src/main/java/sarsoo/fmframework/fx/FMObjListEditTab.java
+++ b/src/main/java/sarsoo/fmframework/fx/FMObjListEditTab.java
@@ -1,20 +1,10 @@
 package sarsoo.fmframework.fx;
 
 import java.io.IOException;
-import java.text.NumberFormat;
-import java.util.Collections;
-import java.util.Locale;
-
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
-import sarsoo.fmframework.fx.controller.FMObjListPaneController;
 import sarsoo.fmframework.fx.controller.FMObjListPaneEditController;
-import sarsoo.fmframework.music.FMObj;
 import sarsoo.fmframework.util.FMObjList;
-import sarsoo.fmframework.util.Maths;
-import sarsoo.fmframework.util.Reference;
-
-import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 
 public class FMObjListEditTab extends Tab {
diff --git a/src/main/java/sarsoo/fmframework/fx/FMObjListTab.java b/src/main/java/sarsoo/fmframework/fx/FMObjListTab.java
index c53fa8c..cb98948 100644
--- a/src/main/java/sarsoo/fmframework/fx/FMObjListTab.java
+++ b/src/main/java/sarsoo/fmframework/fx/FMObjListTab.java
@@ -1,20 +1,10 @@
 package sarsoo.fmframework.fx;
 
 import java.io.IOException;
-import java.text.NumberFormat;
-import java.util.Collections;
-import java.util.Locale;
-
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
 import sarsoo.fmframework.fx.controller.FMObjListPaneController;
-import sarsoo.fmframework.fx.controller.FMObjListPaneEditController;
-import sarsoo.fmframework.music.FMObj;
 import sarsoo.fmframework.util.FMObjList;
-import sarsoo.fmframework.util.Maths;
-import sarsoo.fmframework.util.Reference;
-
-import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 
 public class FMObjListTab extends Tab {
diff --git a/src/main/java/sarsoo/fmframework/fx/TrackTab.java b/src/main/java/sarsoo/fmframework/fx/TrackTab.java
index 60e7391..ac24ba1 100644
--- a/src/main/java/sarsoo/fmframework/fx/TrackTab.java
+++ b/src/main/java/sarsoo/fmframework/fx/TrackTab.java
@@ -4,9 +4,7 @@ import java.io.IOException;
 
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
-import sarsoo.fmframework.fx.controller.AlbumPaneController;
 import sarsoo.fmframework.fx.controller.TrackPaneController;
-import sarsoo.fmframework.music.Album;
 import sarsoo.fmframework.music.Track;
 import javafx.fxml.FXMLLoader;
 
diff --git a/src/main/java/sarsoo/fmframework/fx/controller/AlbumGetPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/AlbumGetPaneController.java
index dd23cf3..adc5080 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/AlbumGetPaneController.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/AlbumGetPaneController.java
@@ -2,7 +2,6 @@ package sarsoo.fmframework.fx.controller;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
-import javafx.event.ActionEvent;
 
 public class AlbumGetPaneController {
 	
diff --git a/src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java
index 9597388..f1f44c2 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java
@@ -2,31 +2,18 @@ package sarsoo.fmframework.fx.controller;
 
 import java.io.IOException;
 import java.text.NumberFormat;
-import java.util.ArrayList;
 import java.util.Locale;
 
-import javax.swing.JOptionPane;
-
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.text.Text;
 import sarsoo.fmframework.fx.ArtistTab;
 import sarsoo.fmframework.fx.FmFramework;
 import sarsoo.fmframework.music.Album;
 import sarsoo.fmframework.music.Wiki;
 import sarsoo.fmframework.net.Network;
-import sarsoo.fmframework.util.FMObjList;
-import sarsoo.fmframework.util.Getter;
 import sarsoo.fmframework.util.Maths;
 import sarsoo.fmframework.util.Reference;
 import javafx.scene.control.*;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.layout.GridPane;
-import javafx.scene.chart.*;
-import javafx.collections.ObservableList;
-import javafx.collections.FXCollections;
 
 public class AlbumPaneController {
 
diff --git a/src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java
index 107ab5a..ef11327 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java
@@ -2,33 +2,19 @@ package sarsoo.fmframework.fx.controller;
 
 import java.io.IOException;
 import java.text.NumberFormat;
-import java.util.ArrayList;
 import java.util.Locale;
 
-import javax.swing.JOptionPane;
-
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.text.Text;
-import sarsoo.fmframework.fx.ArtistTab;
 import sarsoo.fmframework.fx.FMObjListTab;
 import sarsoo.fmframework.fx.FmFramework;
-import sarsoo.fmframework.music.Album;
 import sarsoo.fmframework.music.Artist;
 import sarsoo.fmframework.music.Wiki;
 import sarsoo.fmframework.net.Network;
-import sarsoo.fmframework.util.FMObjList;
 import sarsoo.fmframework.util.Getter;
 import sarsoo.fmframework.util.Maths;
 import sarsoo.fmframework.util.Reference;
 import javafx.scene.control.*;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.layout.GridPane;
-import javafx.scene.chart.*;
-import javafx.collections.ObservableList;
-import javafx.collections.FXCollections;
 
 public class ArtistPaneController {
 	
diff --git a/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java b/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java
index aa073bb..b6771e2 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java
@@ -12,11 +12,8 @@ import java.util.concurrent.CountDownLatch;
 import javax.swing.JOptionPane;
 
 import javafx.event.ActionEvent;
-import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.text.Text;
 import javafx.stage.FileChooser;
 import sarsoo.fmframework.file.ListPersister;
 import sarsoo.fmframework.fx.AlbumTab;
@@ -35,21 +32,16 @@ import sarsoo.fmframework.util.FMObjList;
 import sarsoo.fmframework.util.Getter;
 import sarsoo.fmframework.util.Reference;
 import javafx.scene.control.*;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.GridPane;
 import javafx.scene.chart.*;
 import javafx.scene.chart.PieChart.Data;
 import javafx.collections.ObservableList;
 import javafx.collections.FXCollections;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
-import javafx.scene.Parent;
-
 import javafx.scene.layout.*;
 
 import javafx.concurrent.*;
 import javafx.application.Platform;
-import javafx.scene.paint.Color;
 
 public class ControllerMain {
 
diff --git a/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java
index 1856fa3..d3f1b7d 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java
@@ -14,7 +14,6 @@ import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.input.MouseEvent;
-import sarsoo.fmframework.fx.AlbumTab;
 import sarsoo.fmframework.fx.ArtistTab;
 import sarsoo.fmframework.fx.FmFramework;
 import sarsoo.fmframework.music.Artist;
diff --git a/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java b/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java
index faf1c52..0563a03 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java
@@ -4,7 +4,6 @@ import java.io.File;
 import java.io.IOException;
 import java.text.NumberFormat;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Locale;
 
 import javafx.collections.FXCollections;
@@ -30,7 +29,6 @@ import sarsoo.fmframework.util.Maths;
 import sarsoo.fmframework.util.Reference;
 import javafx.scene.layout.*;
 import javafx.scene.chart.*;
-import javafx.scene.chart.PieChart.Data;
 import javafx.stage.FileChooser;
 public class FMObjListPaneEditController {
 
diff --git a/src/main/java/sarsoo/fmframework/fx/styles/FMObjListPane.css b/src/main/java/sarsoo/fmframework/fx/styles/FMObjListPane.css
deleted file mode 100644
index 900bf39..0000000
--- a/src/main/java/sarsoo/fmframework/fx/styles/FMObjListPane.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.nameLabel{
-	-fx-alignment: center;
-	-fx-font-size: 150%;
-	-fx-font-style: italic;
-	-fx-text-alignment: center;
-	
-
-}
-
-.number{
-	-fx-text-alignment: right;
-	
-	-fx-font-style: italic;
-
-}
-
-.totalScrobbles{
-	
-	-fx-font-style: italic;
-
-}
-
-.stats{
-	
-	
-	-fx-font-size: 300%;
-	
-	-fx-font-style: italic;
-
-}
-
-.pane{
-	
-	
-	
-}
-
-.pieChart{
-	
-	-fx-start-angle: 90;
-	
-	
-}
-
-.default-color0.chart-pie { -fx-pie-color: #820000; }
-.default-color1.chart-pie { -fx-pie-color: #49505b; }
\ No newline at end of file
diff --git a/src/main/java/sarsoo/fmframework/fx/styles/ObjPane.css b/src/main/java/sarsoo/fmframework/fx/styles/ObjPane.css
deleted file mode 100644
index 6d146c7..0000000
--- a/src/main/java/sarsoo/fmframework/fx/styles/ObjPane.css
+++ /dev/null
@@ -1,29 +0,0 @@
-.titleLabel{
-	
-	-fx-font-size: 600%;
-	-fx-font-weight: bolder;
-
-}
-
-.subLabel{
-	
-	-fx-font-size: 300%;
-	-fx-font-weight: bold;
-}
-
-.normalLabel{
-	
-	-fx-font-size: 200%;
-	
-}
-
-.wikiTextArea{
-
-
-}
-
-.stats{
-
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/sarsoo/fmframework/fx/styles/mainPane.css b/src/main/java/sarsoo/fmframework/fx/styles/mainPane.css
deleted file mode 100644
index 8c82183..0000000
--- a/src/main/java/sarsoo/fmframework/fx/styles/mainPane.css
+++ /dev/null
@@ -1,18 +0,0 @@
-.vBoxStats{
-	-fx-background-color: #001a44;
-}
-
-.gridPane{
-	
-	-fx-background-color: #a2aec1;
-}
-
-.vBoxStatsLabel{
-	
-	-fx-text-fill: white;
-}
-
-.pieChart{
-	
-	-fx-start-angle: 90;
-}
\ No newline at end of file
diff --git a/src/main/java/sarsoo/fmframework/fx/ui/AlbumPane.fxml b/src/main/java/sarsoo/fmframework/fx/ui/AlbumPane.fxml
deleted file mode 100644
index 0abbcc7..0000000
--- a/src/main/java/sarsoo/fmframework/fx/ui/AlbumPane.fxml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.paint.*?>
-<?import javafx.scene.text.*?>
-
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sarsoo.fmframework.fx.controller.AlbumPaneController">
-   <children>
-      <BorderPane fx:id="albumBorderPane" prefHeight="327.0" prefWidth="600.0" stylesheets="@../styles/ObjPane.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                 <center>
-                                    <SplitPane dividerPositions="0.5" prefHeight="327.0" prefWidth="600.0" BorderPane.alignment="CENTER">
-                                      <items>
-                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
-                                             <children>
-                                                <GridPane prefHeight="325.0" prefWidth="296.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                                  <columnConstraints>
-                                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                                  </columnConstraints>
-                                                  <rowConstraints>
-                                                    <RowConstraints maxHeight="115.0" minHeight="10.0" prefHeight="94.0" vgrow="SOMETIMES" />
-                                                    <RowConstraints maxHeight="181.0" minHeight="10.0" prefHeight="57.0" vgrow="SOMETIMES" />
-                                                    <RowConstraints maxHeight="49.0" minHeight="10.0" prefHeight="33.0" vgrow="SOMETIMES" />
-                                                      <RowConstraints maxHeight="43.0" minHeight="10.0" prefHeight="34.0" vgrow="SOMETIMES" />
-                                                      <RowConstraints maxHeight="39.0" minHeight="10.0" prefHeight="34.0" vgrow="SOMETIMES" />
-                                                      <RowConstraints maxHeight="37.0" minHeight="10.0" prefHeight="35.0" vgrow="SOMETIMES" />
-                                                  </rowConstraints>
-                                                   <children>
-                              <AnchorPane>
-                                 <children>
-                                                            <Label fx:id="labelAlbumName" alignment="CENTER" styleClass="titleLabel" text="Album Name" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
-                                                               <font>
-                                                                  <Font name="System Bold" size="18.0" />
-                                                               </font>
-                                                            </Label>
-                                 </children>
-                              </AnchorPane>
-                              <AnchorPane GridPane.rowIndex="1">
-                                 <children>
-                                                            <Label fx:id="labelArtistName" alignment="CENTER" styleClass="subLabel" text="Artist Name" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER">
-                                                               <font>
-                                                                  <Font size="13.0" />
-                                                               </font>
-                                                            </Label>
-                                 </children>
-                              </AnchorPane>
-                              <AnchorPane GridPane.rowIndex="2">
-                                 <children>
-                                                            <Label fx:id="labelUserScrobbles" alignment="CENTER" styleClass="normalLabel" text="User Scrobbles" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER">
-                                                               <font>
-                                                                  <Font size="13.0" />
-                                                               </font>
-                                                            </Label>
-                                 </children>
-                              </AnchorPane>
-                              <AnchorPane GridPane.rowIndex="3">
-                                 <children>
-                                                            <Label fx:id="labelRatio" alignment="CENTER" styleClass="normalLabel" text="Ratio" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="3">
-                                                               <font>
-                                                                  <Font size="13.0" />
-                                                               </font>
-                                                            </Label>
-                                 </children>
-                              </AnchorPane>
-                              <AnchorPane GridPane.rowIndex="4">
-                                 <children>
-                                                            <Label fx:id="labelTotalListeners" alignment="CENTER" styleClass="normalLabel" text="Total Listeners" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="4">
-                                                               <font>
-                                                                  <Font size="13.0" />
-                                                               </font>
-                                                            </Label>
-                                 </children>
-                              </AnchorPane>
-                              <AnchorPane GridPane.rowIndex="5">
-                                 <children>
-                                                            <Label fx:id="labelTotalScrobbles" alignment="CENTER" styleClass="normalLabel" text="Total Scrobbles" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="5">
-                                                               <font>
-                                                                  <Font size="13.0" />
-                                                               </font>
-                                                            </Label>
-                                 </children>
-                              </AnchorPane>
-                                                   </children>
-                                                </GridPane>
-                                             </children>
-                                          </AnchorPane>
-                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
-                                             <children>
-                                                <TextArea fx:id="textAreaWiki" editable="false" layoutX="37.0" layoutY="34.0" prefHeight="285.0" prefWidth="296.0" styleClass="wikiTextArea" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-                                             </children>
-                                          </AnchorPane>
-                                      </items>
-                                    </SplitPane>
-                                 </center>
-                                 <bottom>
-                                    <ToolBar fx:id="toolBar" prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-                                      <items>
-                  <Button fx:id="buttonRefresh" mnemonicParsing="false" onAction="#handleRefresh" text="refresh" />
-                  <Button fx:id="buttonViewArtist" mnemonicParsing="false" onAction="#viewArtist" text="view artist" />
-                                        <Button fx:id="buttonViewOnline" mnemonicParsing="false" onAction="#viewOnline" text="view online" />
-                  <Button fx:id="buttonViewRYM" mnemonicParsing="false" onAction="#viewRYM" text="view rym" />
-                                      </items>
-                                    </ToolBar>
-                                 </bottom>
-                              </BorderPane>
-   </children>
-</AnchorPane>
diff --git a/src/main/java/sarsoo/fmframework/fx/ui/ArtistPane.fxml b/src/main/java/sarsoo/fmframework/fx/ui/ArtistPane.fxml
deleted file mode 100644
index 298aee3..0000000
--- a/src/main/java/sarsoo/fmframework/fx/ui/ArtistPane.fxml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.paint.*?>
-<?import javafx.scene.text.*?>
-
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sarsoo.fmframework.fx.controller.ArtistPaneController">
-   <children>
-      <BorderPane fx:id="albumBorderPane" prefHeight="800.0" prefWidth="1000.0" stylesheets="@../styles/ObjPane.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                 <center>
-                                    <SplitPane dividerPositions="0.6983967935871743" prefHeight="327.0" prefWidth="600.0" BorderPane.alignment="CENTER">
-                                      <items>
-                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
-                                             <children>
-                                                <GridPane prefHeight="325.0" prefWidth="296.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                                  <columnConstraints>
-                                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                                  </columnConstraints>
-                                                  <rowConstraints>
-                                                    <RowConstraints maxHeight="213.0" minHeight="10.0" prefHeight="213.0" vgrow="SOMETIMES" />
-                                                    <RowConstraints maxHeight="49.0" minHeight="0.0" prefHeight="0.0" vgrow="SOMETIMES" />
-                                                      <RowConstraints maxHeight="43.0" minHeight="10.0" prefHeight="34.0" vgrow="SOMETIMES" />
-                                                      <RowConstraints maxHeight="39.0" minHeight="10.0" prefHeight="34.0" vgrow="SOMETIMES" />
-                                                      <RowConstraints maxHeight="37.0" minHeight="10.0" prefHeight="35.0" vgrow="SOMETIMES" />
-                                                  </rowConstraints>
-                                                   <children>
-                              <AnchorPane>
-                                 <children>
-                                                            <Label fx:id="labelArtistName" alignment="CENTER" prefHeight="165.0" prefWidth="296.0" styleClass="titleLabel" text="Artist Name" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
-                                                               <font>
-                                                                  <Font name="System Bold" size="18.0" />
-                                                               </font>
-                                                            </Label>
-                                 </children>
-                              </AnchorPane>
-                              <AnchorPane GridPane.rowIndex="1">
-                                 <children>
-                                                            <Label fx:id="labelUserScrobbles" alignment="CENTER" styleClass="normalLabel" text="User Scrobbles" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER">
-                                                               <font>
-                                                                  <Font size="13.0" />
-                                                               </font>
-                                                            </Label>
-                                 </children>
-                              </AnchorPane>
-                              <AnchorPane GridPane.rowIndex="2">
-                                 <children>
-                                                            <Label fx:id="labelRatio" alignment="CENTER" styleClass="normalLabel" text="Ratio" AnchorPane.bottomAnchor="8.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="2">
-                                                               <font>
-                                                                  <Font size="13.0" />
-                                                               </font>
-                                                            </Label>
-                                 </children>
-                              </AnchorPane>
-                              <AnchorPane GridPane.rowIndex="3">
-                                 <children>
-                                                            <Label fx:id="labelTotalListeners" alignment="CENTER" styleClass="normalLabel" text="Total Listeners" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="3">
-                                                               <font>
-                                                                  <Font size="13.0" />
-                                                               </font>
-                                                            </Label>
-                                 </children>
-                              </AnchorPane>
-                              <AnchorPane GridPane.rowIndex="4">
-                                 <children>
-                                                            <Label fx:id="labelTotalScrobbles" alignment="CENTER" styleClass="normalLabel" text="Total Scrobbles" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="4">
-                                                               <font>
-                                                                  <Font size="13.0" />
-                                                               </font>
-                                                            </Label>
-                                 </children>
-                              </AnchorPane>
-                                                   </children>
-                                                </GridPane>
-                                             </children>
-                                          </AnchorPane>
-                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
-                                             <children>
-                                                <TextArea fx:id="textAreaWiki" editable="false" layoutX="37.0" layoutY="34.0" prefHeight="285.0" prefWidth="296.0" styleClass="wikiTextArea" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-                                             </children>
-                                          </AnchorPane>
-                                      </items>
-                                    </SplitPane>
-                                 </center>
-                                 <bottom>
-                                    <ToolBar fx:id="toolBar" prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-                                      <items>
-                  <Button fx:id="buttonRefresh" mnemonicParsing="false" onAction="#handleRefresh" text="refresh" />
-                  <Button fx:id="buttonViewTracks" mnemonicParsing="false" onAction="#handleViewTracks" text="view tracks" />
-                                        <Button fx:id="buttonViewOnline" mnemonicParsing="false" onAction="#viewOnline" text="view online" />
-                  <Button fx:id="buttonViewRYM" mnemonicParsing="false" onAction="#viewRYM" text="view rym" />
-                                      </items>
-                                    </ToolBar>
-                                 </bottom>
-                              </BorderPane>
-   </children>
-</AnchorPane>
diff --git a/src/main/java/sarsoo/fmframework/fx/ui/FMObjListPane.fxml b/src/main/java/sarsoo/fmframework/fx/ui/FMObjListPane.fxml
deleted file mode 100644
index 58da38c..0000000
--- a/src/main/java/sarsoo/fmframework/fx/ui/FMObjListPane.fxml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.text.*?>
-<?import javafx.scene.chart.*?>
-<?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
-
-<AnchorPane prefWidth="800.0" styleClass="pane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sarsoo.fmframework.fx.controller.FMObjListPaneController">
-   <children>
-      <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="800.0" styleClass="pane" stylesheets="@../styles/FMObjListPane.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-         <center>
-            <SplitPane dividerPositions="0.6353383458646616">
-               <items>
-                  <ScrollPane fitToHeight="true" fitToWidth="true" prefViewportHeight="369.0" prefViewportWidth="600.0">
-                     <content>
-                        <GridPane fx:id="gridPaneFMObjs" alignment="CENTER" BorderPane.alignment="CENTER">
-                          <columnConstraints>
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="301.0" minWidth="10.0" prefWidth="301.0" />
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="290.0" minWidth="10.0" prefWidth="157.0" />
-                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="194.0" minWidth="10.0" prefWidth="106.0" />
-                          </columnConstraints>
-                        </GridPane>
-                     </content>
-                  </ScrollPane>
-                  <SplitPane dividerPositions="0.5" orientation="VERTICAL">
-                     <items>
-                        <PieChart fx:id="pieChart" legendVisible="false" prefHeight="250.0" styleClass="pieChart" />
-                        <PieChart fx:id="pieChartArtists" legendVisible="false" prefHeight="250.0" styleClass="pieChart" stylesheets="@../styles/mainPane.css" />
-                     </items>
-                  </SplitPane>
-               </items>
-            </SplitPane>
-         </center>
-         <top>
-            <VBox prefHeight="31.0" BorderPane.alignment="CENTER">
-               <children>
-                  <GridPane>
-                    <columnConstraints>
-                      <ColumnConstraints hgrow="SOMETIMES" maxWidth="383.0" minWidth="10.0" prefWidth="382.0" />
-                      <ColumnConstraints hgrow="SOMETIMES" maxWidth="533.0" minWidth="10.0" prefWidth="339.0" />
-                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="78.0" minWidth="0.0" prefWidth="78.0" />
-                    </columnConstraints>
-                    <rowConstraints>
-                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                    </rowConstraints>
-                     <children>
-                        <Label fx:id="labelTotalScrobbles" styleClass="stats" text="Label" GridPane.halignment="CENTER" />
-                        <Label fx:id="labelPercent" styleClass="stats" text="Label" GridPane.columnIndex="1" GridPane.halignment="CENTER" />
-                        <Button fx:id="buttonRefresh" contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleRefresh" prefHeight="25.0" prefWidth="57.0" text="refresh" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.hgrow="ALWAYS" />
-                     </children>
-                  </GridPane>
-               </children>
-            </VBox>
-         </top>
-      </BorderPane>
-   </children>
-</AnchorPane>
diff --git a/src/main/java/sarsoo/fmframework/fx/ui/FMObjListPaneEdit.fxml b/src/main/java/sarsoo/fmframework/fx/ui/FMObjListPaneEdit.fxml
deleted file mode 100644
index a369a30..0000000
--- a/src/main/java/sarsoo/fmframework/fx/ui/FMObjListPaneEdit.fxml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.text.*?>
-<?import javafx.scene.chart.*?>
-<?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
-
-<AnchorPane prefWidth="800.0" styleClass="pane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sarsoo.fmframework.fx.controller.FMObjListPaneEditController">
-   <children>
-      <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="800.0" styleClass="pane" stylesheets="@../styles/FMObjListPane.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-         <center>
-            <SplitPane dividerPositions="0.6353383458646616">
-               <items>
-                  <ScrollPane fitToHeight="true" fitToWidth="true" prefViewportHeight="369.0" prefViewportWidth="600.0">
-                     <content>
-                        <GridPane fx:id="gridPaneFMObjs" alignment="CENTER" BorderPane.alignment="CENTER">
-                          <columnConstraints>
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="301.0" minWidth="10.0" prefWidth="301.0" />
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="290.0" minWidth="10.0" prefWidth="157.0" />
-                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="194.0" minWidth="10.0" prefWidth="106.0" />
-                              <ColumnConstraints halignment="RIGHT" hgrow="NEVER" maxWidth="194.0" minWidth="10.0" prefWidth="60.0" />
-                          </columnConstraints>
-                        </GridPane>
-                     </content>
-                  </ScrollPane>
-                  <SplitPane dividerPositions="0.5" orientation="VERTICAL">
-                     <items>
-                        <PieChart fx:id="pieChart" legendVisible="false" prefHeight="250.0" styleClass="pieChart" />
-                        <PieChart fx:id="pieChartArtists" legendVisible="false" prefHeight="250.0" styleClass="pieChart" stylesheets="@../styles/mainPane.css" />
-                     </items>
-                  </SplitPane>
-               </items>
-            </SplitPane>
-         </center>
-         <top>
-            <VBox prefHeight="31.0" BorderPane.alignment="CENTER">
-               <children>
-                  <AnchorPane>
-                     <children>
-                        <GridPane layoutY="11.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                          <columnConstraints>
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="383.0" minWidth="10.0" prefWidth="382.0" />
-                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="533.0" minWidth="10.0" prefWidth="339.0" />
-                          </columnConstraints>
-                          <rowConstraints>
-                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                          </rowConstraints>
-                           <children>
-                              <Label fx:id="labelTotalScrobbles" styleClass="stats" text="0" GridPane.halignment="CENTER" />
-                              <Label fx:id="labelPercent" styleClass="stats" text="0%" GridPane.columnIndex="1" GridPane.halignment="CENTER" />
-                           </children>
-                        </GridPane>
-                     </children>
-                  </AnchorPane>
-               </children>
-            </VBox>
-         </top>
-         <bottom>
-            <ToolBar prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-              <items>
-                  <TextField fx:id="textTrack" prefHeight="25.0" prefWidth="217.0" promptText="track" />
-                  <TextField fx:id="textAlbum" prefHeight="25.0" prefWidth="239.0" promptText="album" />
-                  <TextField fx:id="textArtist" prefHeight="25.0" prefWidth="230.0" promptText="artist" />
-                  <MenuButton fx:id="menuButtonAdd" alignment="CENTER_RIGHT" contentDisplay="CENTER" mnemonicParsing="false" text="add">
-                    <items>
-                      <MenuItem fx:id="menuItemTrack" mnemonicParsing="false" onAction="#handleAddTrack" text="track" />
-                      <MenuItem fx:id="menuItemAlbum" mnemonicParsing="false" onAction="#handleAddAlbum" text="album" />
-                        <MenuItem fx:id="menuItemArtist" mnemonicParsing="false" onAction="#handleAddArtist" text="artist" />
-                    </items>
-                  </MenuButton>
-                  <Button fx:id="buttonRefresh" contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleRefresh" prefHeight="25.0" prefWidth="57.0" text="refresh" />
-                  <Button mnemonicParsing="false" onAction="#handleSave" text="save" />
-              </items>
-            </ToolBar>
-         </bottom>
-      </BorderPane>
-   </children>
-</AnchorPane>
diff --git a/src/main/java/sarsoo/fmframework/fx/ui/TrackPane.fxml b/src/main/java/sarsoo/fmframework/fx/ui/TrackPane.fxml
deleted file mode 100644
index b01abe4..0000000
--- a/src/main/java/sarsoo/fmframework/fx/ui/TrackPane.fxml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.paint.*?>
-<?import javafx.scene.text.*?>
-
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sarsoo.fmframework.fx.controller.TrackPaneController">
-   <children>
-      <BorderPane fx:id="albumBorderPane" prefHeight="327.0" prefWidth="600.0" stylesheets="@../styles/ObjPane.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                 <center>
-                                    <SplitPane dividerPositions="0.5" prefHeight="327.0" prefWidth="600.0" BorderPane.alignment="CENTER">
-                                      <items>
-                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
-                                             <children>
-                                                <GridPane prefHeight="325.0" prefWidth="296.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                                  <columnConstraints>
-                                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                                  </columnConstraints>
-                                                  <rowConstraints>
-                                                    <RowConstraints maxHeight="115.0" minHeight="10.0" prefHeight="94.0" vgrow="SOMETIMES" />
-                              <RowConstraints maxHeight="181.0" minHeight="10.0" prefHeight="57.0" vgrow="SOMETIMES" />
-                                                    <RowConstraints maxHeight="181.0" minHeight="10.0" prefHeight="57.0" vgrow="SOMETIMES" />
-                                                    <RowConstraints maxHeight="49.0" minHeight="10.0" prefHeight="33.0" vgrow="SOMETIMES" />
-                                                      <RowConstraints maxHeight="43.0" minHeight="10.0" prefHeight="34.0" vgrow="SOMETIMES" />
-                                                      <RowConstraints maxHeight="39.0" minHeight="10.0" prefHeight="34.0" vgrow="SOMETIMES" />
-                                                      <RowConstraints maxHeight="37.0" minHeight="10.0" prefHeight="35.0" vgrow="SOMETIMES" />
-                                                  </rowConstraints>
-                                                   <children>
-                                                      <Label fx:id="labelTrackName" alignment="CENTER" styleClass="titleLabel" text="Track Name" wrapText="true" GridPane.halignment="CENTER" GridPane.hgrow="ALWAYS" GridPane.valignment="CENTER">
-                                                         <font>
-                                                            <Font name="System Bold" size="18.0" />
-                                                         </font>
-                                                      </Label>
-                                                      <Label fx:id="labelArtistName" alignment="CENTER" styleClass="subLabel" text="Artist Name" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER">
-                                                         <font>
-                                                            <Font size="13.0" />
-                                                         </font>
-                                                      </Label>
-                                                      <Label fx:id="labelUserScrobbles" alignment="CENTER" styleClass="normalLabel" text="User Scrobbles" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
-                                                         <font>
-                                                            <Font size="13.0" />
-                                                         </font>
-                                                      </Label>
-                                                      <Label fx:id="labelRatio" alignment="CENTER" styleClass="normalLabel" text="Ratio" GridPane.halignment="CENTER" GridPane.rowIndex="4">
-                                                         <font>
-                                                            <Font size="13.0" />
-                                                         </font>
-                                                      </Label>
-                                                      <Label fx:id="labelTotalListeners" alignment="CENTER" styleClass="normalLabel" text="Total Listeners" GridPane.halignment="CENTER" GridPane.rowIndex="5">
-                                                         <font>
-                                                            <Font size="13.0" />
-                                                         </font>
-                                                      </Label>
-                                                      <Label fx:id="labelTotalScrobbles" alignment="CENTER" styleClass="normalLabel" text="Total Scrobbles" GridPane.halignment="CENTER" GridPane.rowIndex="6">
-                                                         <font>
-                                                            <Font size="13.0" />
-                                                         </font>
-                                                      </Label>
-                              <Label fx:id="labelAlbumName" alignment="CENTER" styleClass="subLabel" text="Album Name" GridPane.halignment="CENTER" GridPane.rowIndex="1">
-                                 <font>
-                                    <Font size="13.0" />
-                                 </font>
-                              </Label>
-                                                   </children>
-                                                </GridPane>
-                                             </children>
-                                          </AnchorPane>
-                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
-                                             <children>
-                                                <TextArea fx:id="textAreaWiki" editable="false" layoutX="37.0" layoutY="34.0" prefHeight="285.0" prefWidth="296.0" styleClass="wikiTextArea" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-                                             </children>
-                                          </AnchorPane>
-                                      </items>
-                                    </SplitPane>
-                                 </center>
-                                 <bottom>
-                                    <ToolBar fx:id="toolBar" prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-                                      <items>
-                  <Button fx:id="buttonRefresh" mnemonicParsing="false" onAction="#handleRefresh" text="refresh" />
-                  <Button fx:id="buttonViewAlbum" mnemonicParsing="false" onAction="#viewAlbum" text="view album" />
-                  <Button fx:id="buttonViewArtist" mnemonicParsing="false" onAction="#viewArtist" text="view artist" />
-                                        <Button fx:id="buttonViewOnline" mnemonicParsing="false" onAction="#viewOnline" text="view online" />
-                                      </items>
-                                    </ToolBar>
-                                 </bottom>
-                              </BorderPane>
-   </children>
-</AnchorPane>
diff --git a/src/main/java/sarsoo/fmframework/fx/ui/albumgetpane.fxml b/src/main/java/sarsoo/fmframework/fx/ui/albumgetpane.fxml
deleted file mode 100644
index 99000d5..0000000
--- a/src/main/java/sarsoo/fmframework/fx/ui/albumgetpane.fxml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
-
-<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="sarsoo.fmframework.fx.controller.albumGetPaneController">
-  <columnConstraints>
-    <ColumnConstraints hgrow="SOMETIMES" maxWidth="343.0" minWidth="10.0" prefWidth="238.0" />
-    <ColumnConstraints hgrow="SOMETIMES" maxWidth="423.0" minWidth="10.0" prefWidth="362.0" />
-  </columnConstraints>
-  <rowConstraints>
-    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-  </rowConstraints>
-   <children>
-      <Button fx:id="getButton" mnemonicParsing="false" text="get" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
-      <TextField fx:id="albumName" GridPane.columnIndex="1" />
-      <TextField fx:id="artistName" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-      <Label text="album" GridPane.halignment="CENTER" />
-      <Label text="artist" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
-   </children>
-</GridPane>
diff --git a/src/main/java/sarsoo/fmframework/fx/ui/main.fxml b/src/main/java/sarsoo/fmframework/fx/ui/main.fxml
deleted file mode 100644
index a7ec35c..0000000
--- a/src/main/java/sarsoo/fmframework/fx/ui/main.fxml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.text.*?>
-<?import javafx.scene.chart.*?>
-<?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
-
-<BorderPane fx:id="borderPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" onKeyPressed="#handleKeyShortcut" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sarsoo.fmframework.fx.controller.ControllerMain">
-   <top>
-      <MenuBar fx:id="menuBar" BorderPane.alignment="CENTER">
-        <menus>
-            <Menu fx:id="menuFile" mnemonicParsing="false" text="file">
-              <items>
-                  <MenuItem fx:id="menuItemCreateList" mnemonicParsing="false" onAction="#handleCreateList" text="new list" />
-                  <MenuItem fx:id="menuItemListEdit" mnemonicParsing="false" onAction="#handleListEdit" text="open list" />
-              </items>
-            </Menu>
-          <Menu fx:id="menuLookup" mnemonicParsing="false" text="lookup">
-            <items>
-              <MenuItem fx:id="menuItemTrack" mnemonicParsing="false" onAction="#handleLookupTrack" text="track" />
-                  <MenuItem fx:id="menuItemAlbum" mnemonicParsing="false" onAction="#handleLookupAlbum" text="album" />
-                  <MenuItem fx:id="menuItemArtist" mnemonicParsing="false" onAction="#handleLookupArtist" text="artist" />
-            </items>
-          </Menu>
-          <Menu fx:id="menuTag" mnemonicParsing="false" text="tags" />
-            <Menu fx:id="menuUtil" mnemonicParsing="false" text="util">
-              <items>
-                <MenuItem fx:id="menuItemScrobble" mnemonicParsing="false" onAction="#handleScrobble" text="scrobble" />
-                  <MenuItem fx:id="menuItemCurrentTrack" mnemonicParsing="false" onAction="#handleCurrentTrack" text="current track" />
-                  <MenuItem fx:id="menuItemOpenConsole" mnemonicParsing="false" onAction="#handleOpenConsole" text="open console" />
-                  <MenuItem mnemonicParsing="false" onAction="#handleChangeUsername" text="set username" />
-              </items>
-            </Menu>
-        </menus>
-      </MenuBar>
-   </top>
-   <bottom>
-      <VBox fx:id="vBoxStats" prefHeight="19.0" prefWidth="600.0" BorderPane.alignment="CENTER">
-         <children>
-            <FlowPane fx:id="flowPlaneStats" alignment="TOP_RIGHT" prefHeight="20.0" prefWidth="600.0" styleClass="vBoxStats" stylesheets="@../styles/mainPane.css" VBox.vgrow="NEVER">
-               <children>
-                  <Label fx:id="labelStatsUsername" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="user" />
-                  <Label fx:id="labelStatsScrobblesToday" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="scrobblesToday" />
-                  <Label fx:id="labelStatsSlash" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="/" />
-                  <Label fx:id="labelStatsScrobblesTotal" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="scrobblesTotal" />
-               </children>
-            </FlowPane>
-         </children>
-      </VBox>
-   </bottom>
-   <center>
-      <TabPane fx:id="tabPane" prefHeight="200.0" prefWidth="200.0" side="BOTTOM" BorderPane.alignment="CENTER">
-         <tabs>
-            <Tab fx:id="tabHome" closable="false" text="home">
-              <content>
-                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
-                     <children>
-                        <BorderPane prefHeight="354.0" prefWidth="211.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                           <center>
-                              <Accordion fx:id="accordionCharts" prefHeight="325.0" prefWidth="222.0" BorderPane.alignment="CENTER">
-                                <panes>
-                                  <TitledPane fx:id="titledPaneGenres" animated="false" text="genres">
-                                    <content>
-                                      <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
-                                             <children>
-                                                <PieChart fx:id="pieChartGenres" prefHeight="263.0" prefWidth="209.0" styleClass="pieChart" stylesheets="@../styles/mainPane.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-                                             </children>
-                                          </AnchorPane>
-                                    </content>
-                                  </TitledPane>
-                                  <TitledPane fx:id="titledPaneRap" animated="false" text="rap">
-                                    <content>
-                                      <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
-                                             <children>
-                                                <GridPane prefHeight="303.0" prefWidth="209.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                                  <columnConstraints>
-                                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                                  </columnConstraints>
-                                                  <rowConstraints>
-                                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                  </rowConstraints>
-                                                   <children>
-                                                      <PieChart fx:id="pieChartRapTotal" prefHeight="274.0" prefWidth="220.0" styleClass="pieChart" stylesheets="@../styles/mainPane.css" title="total" GridPane.rowIndex="1" />
-                                                      <PieChart fx:id="pieChartRap" styleClass="pieChart" stylesheets="@../styles/mainPane.css" title="rap" />
-                                                   </children>
-                                                </GridPane>
-                                             </children>
-                                          </AnchorPane>
-                                    </content>
-                                  </TitledPane>
-                                    <TitledPane animated="false" text="rock">
-                                      <content>
-                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
-                                             <children>
-                                                <GridPane prefHeight="240.0" prefWidth="569.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                                   <children>
-                                                      <PieChart fx:id="pieChartRockTotal" prefHeight="274.0" prefWidth="220.0" styleClass="pieChart" stylesheets="@../styles/mainPane.css" title="total" GridPane.rowIndex="1" />
-                                                      <PieChart fx:id="pieChartRock" styleClass="pieChart" stylesheets="@../styles/mainPane.css" title="rock" />
-                                                   </children>
-                                                   <columnConstraints>
-                                                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                                   </columnConstraints>
-                                                   <rowConstraints>
-                                                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                   </rowConstraints>
-                                                </GridPane>
-                                             </children>
-                                          </AnchorPane>
-                                      </content>
-                                    </TitledPane>
-                                </panes>
-                              </Accordion>
-                           </center>
-                           <bottom>
-                              <ToolBar prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-                                <items>
-                                  <Button fx:id="buttonPieChartRefresh" mnemonicParsing="false" onAction="#handleRefreshPieChart" text="refresh" />
-                                </items>
-                              </ToolBar>
-                           </bottom>
-                        </BorderPane>
-                     </children>
-                  </AnchorPane>
-              </content>
-            </Tab>
-            
-         </tabs></TabPane>
-   </center>
-</BorderPane>
diff --git a/src/main/java/sarsoo/fmframework/fx/ui/template.fxml b/src/main/java/sarsoo/fmframework/fx/ui/template.fxml
deleted file mode 100644
index 1a3f6d1..0000000
--- a/src/main/java/sarsoo/fmframework/fx/ui/template.fxml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.text.*?>
-<?import javafx.scene.chart.*?>
-<?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
-
-<BorderPane fx:id="borderPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sarsoo.fmframework.fx.controller.ControllerMain">
-   <top>
-      <MenuBar fx:id="menuBar" BorderPane.alignment="CENTER">
-        <menus>
-          <Menu fx:id="menuLookup" mnemonicParsing="false" text="Lookup">
-            <items>
-              <MenuItem fx:id="menuItemTrack" mnemonicParsing="false" text="Track" />
-                  <MenuItem fx:id="menuItemAlbum" mnemonicParsing="false" onAction="#handleLookupAlbum" text="Album" />
-                  <MenuItem fx:id="menuItemArtist" mnemonicParsing="false" text="Artist" />
-            </items>
-          </Menu>
-          <Menu mnemonicParsing="false" text="Edit">
-            <items>
-              <MenuItem mnemonicParsing="false" text="Delete" />
-            </items>
-          </Menu>
-          <Menu mnemonicParsing="false" text="Help">
-            <items>
-              <MenuItem mnemonicParsing="false" text="About" />
-            </items>
-          </Menu>
-        </menus>
-      </MenuBar>
-   </top>
-   <bottom>
-      <VBox fx:id="vBoxStats" prefHeight="19.0" prefWidth="600.0" BorderPane.alignment="CENTER">
-         <children>
-            <FlowPane fx:id="flowPlaneStats" alignment="TOP_RIGHT" prefHeight="20.0" prefWidth="600.0" styleClass="vBoxStats" stylesheets="@../styles/mainPane.css" VBox.vgrow="NEVER">
-               <children>
-                  <Label fx:id="labelStatsUsername" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="user" />
-                  <Label fx:id="labelStatsScrobblesToday" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="scrobblesToday" />
-                  <Label fx:id="labelStatsSlash" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="/" />
-                  <Label fx:id="labelStatsScrobblesTotal" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="scrobblesTotal" />
-               </children>
-            </FlowPane>
-         </children>
-      </VBox>
-   </bottom>
-   <center>
-      <TabPane fx:id="tabPane" prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
-         <tabs>
-            <Tab fx:id="tabHome" closable="false" text="home">
-              <content>
-                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
-                     <children>
-                        <SplitPane fx:id="splitPaneHome" dividerPositions="0.6237458193979933" prefHeight="327.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                          <items>
-                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0" />
-                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
-                                 <children>
-                                    <Accordion fx:id="accordionCharts" prefHeight="325.0" prefWidth="222.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                      <panes>
-                                        <TitledPane fx:id="titledPaneGenres" animated="false" text="genres">
-                                          <content>
-                                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
-                                                   <children>
-                                                      <PieChart fx:id="pieChartGenres" layoutX="-189.0" layoutY="-102.0" prefHeight="249.0" prefWidth="220.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-                                                   </children>
-                                                </AnchorPane>
-                                          </content>
-                                        </TitledPane>
-                                        <TitledPane fx:id="titledPaneRap" animated="false" text="rap">
-                                          <content>
-                                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
-                                                   <children>
-                                                      <PieChart prefHeight="274.0" prefWidth="220.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-                                                   </children>
-                                                </AnchorPane>
-                                          </content>
-                                        </TitledPane>
-                                      </panes>
-                                    </Accordion>
-                                 </children>
-                              </AnchorPane>
-                          </items>
-                        </SplitPane>
-                     </children>
-                  </AnchorPane>
-              </content>
-            </Tab>
-            
-         </tabs></TabPane>
-   </center>
-</BorderPane>
diff --git a/src/main/java/sarsoo/fmframework/jframe/Driver.java b/src/main/java/sarsoo/fmframework/jframe/Driver.java
index 304f8df..c2de83c 100644
--- a/src/main/java/sarsoo/fmframework/jframe/Driver.java
+++ b/src/main/java/sarsoo/fmframework/jframe/Driver.java
@@ -1,8 +1,5 @@
 package sarsoo.fmframework.jframe;
 
-import javax.swing.JOptionPane;
-
-import sarsoo.fmframework.util.Getter;
 import sarsoo.fmframework.util.Reference;
 
 public class Driver {
diff --git a/src/main/java/sarsoo/fmframework/jframe/FMObjListView.java b/src/main/java/sarsoo/fmframework/jframe/FMObjListView.java
index 830a601..1b4b86a 100644
--- a/src/main/java/sarsoo/fmframework/jframe/FMObjListView.java
+++ b/src/main/java/sarsoo/fmframework/jframe/FMObjListView.java
@@ -24,7 +24,6 @@ import sarsoo.fmframework.music.Album;
 import sarsoo.fmframework.music.FMObj;
 import sarsoo.fmframework.net.Network;
 import sarsoo.fmframework.util.FMObjList;
-import sarsoo.fmframework.util.Getter;
 import sarsoo.fmframework.util.Maths;
 import sarsoo.fmframework.util.Reference;
 
diff --git a/src/main/java/sarsoo/fmframework/jframe/RefListsView.java b/src/main/java/sarsoo/fmframework/jframe/RefListsView.java
index b478e55..7d638db 100644
--- a/src/main/java/sarsoo/fmframework/jframe/RefListsView.java
+++ b/src/main/java/sarsoo/fmframework/jframe/RefListsView.java
@@ -3,12 +3,8 @@ package sarsoo.fmframework.jframe;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.ArrayList;
-
 import javax.swing.JButton;
 import javax.swing.JFrame;
-import sarsoo.fmframework.util.FMObjList;
-import sarsoo.fmframework.util.Getter;
 import sarsoo.fmframework.util.Reference;
 
 public class RefListsView extends JFrame {
diff --git a/src/main/java/sarsoo/fmframework/jframe/WikiView.java b/src/main/java/sarsoo/fmframework/jframe/WikiView.java
index b6b4286..992aebd 100644
--- a/src/main/java/sarsoo/fmframework/jframe/WikiView.java
+++ b/src/main/java/sarsoo/fmframework/jframe/WikiView.java
@@ -1,25 +1,11 @@
 package sarsoo.fmframework.jframe;
 
-import java.awt.FlowLayout;
 import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Locale;
-
-import javax.swing.JButton;
 import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 
-import sarsoo.fmframework.music.Album;
-import sarsoo.fmframework.music.FMObj;
-import sarsoo.fmframework.music.Track;
 import sarsoo.fmframework.music.Wiki;
-import sarsoo.fmframework.net.Network;
 
 public class WikiView extends JFrame {
 	JTextArea contentLabel = new JTextArea();
diff --git a/src/main/java/sarsoo/fmframework/music/Artist.java b/src/main/java/sarsoo/fmframework/music/Artist.java
index 750d26a..7d94949 100644
--- a/src/main/java/sarsoo/fmframework/music/Artist.java
+++ b/src/main/java/sarsoo/fmframework/music/Artist.java
@@ -6,7 +6,6 @@ import java.util.ArrayList;
 import org.w3c.dom.Document;
 
 import sarsoo.fmframework.net.Network;
-import sarsoo.fmframework.net.TestCall;
 import sarsoo.fmframework.net.URLBuilder;
 //import sarsoo.fmframework.net.TestCall;
 import sarsoo.fmframework.parser.Parser;
diff --git a/src/main/java/sarsoo/fmframework/net/Authenticator.java b/src/main/java/sarsoo/fmframework/net/Authenticator.java
index 02c2fcf..85f5cdb 100644
--- a/src/main/java/sarsoo/fmframework/net/Authenticator.java
+++ b/src/main/java/sarsoo/fmframework/net/Authenticator.java
@@ -3,9 +3,7 @@ package sarsoo.fmframework.net;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.LinkedHashMap;
diff --git a/src/main/java/sarsoo/fmframework/net/Network.java b/src/main/java/sarsoo/fmframework/net/Network.java
index 5cf1f16..2c242ed 100644
--- a/src/main/java/sarsoo/fmframework/net/Network.java
+++ b/src/main/java/sarsoo/fmframework/net/Network.java
@@ -1,19 +1,12 @@
 package sarsoo.fmframework.net;
 
 import java.awt.Desktop;
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
-import java.net.URLEncoder;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
diff --git a/src/main/java/sarsoo/fmframework/parser/Parser.java b/src/main/java/sarsoo/fmframework/parser/Parser.java
index 8e9e9ca..106810e 100644
--- a/src/main/java/sarsoo/fmframework/parser/Parser.java
+++ b/src/main/java/sarsoo/fmframework/parser/Parser.java
@@ -23,7 +23,6 @@ import sarsoo.fmframework.music.Artist;
 import sarsoo.fmframework.music.Tag;
 import sarsoo.fmframework.music.Track;
 import sarsoo.fmframework.music.Wiki;
-import sarsoo.fmframework.net.URLBuilder;
 import sarsoo.fmframework.util.FMObjList;
 import sarsoo.fmframework.util.Reference;
 
diff --git a/src/main/java/sarsoo/fmframework/util/Getter.java b/src/main/java/sarsoo/fmframework/util/Getter.java
index c67158d..6a55675 100644
--- a/src/main/java/sarsoo/fmframework/util/Getter.java
+++ b/src/main/java/sarsoo/fmframework/util/Getter.java
@@ -9,10 +9,10 @@ import org.w3c.dom.Node;
 import sarsoo.fmframework.music.Tag;
 import sarsoo.fmframework.music.Track;
 import sarsoo.fmframework.net.Network;
-import sarsoo.fmframework.net.TestCall;
 import sarsoo.fmframework.net.URLBuilder;
 import sarsoo.fmframework.parser.Parser;
 
+@Deprecated
 public class Getter {
 	public static Track getLastTrack() {
 		if(Reference.isVerbose())
diff --git a/src/main/java/sarsoo/fmframework/util/Maths.java b/src/main/java/sarsoo/fmframework/util/Maths.java
index 08b577c..6362571 100644
--- a/src/main/java/sarsoo/fmframework/util/Maths.java
+++ b/src/main/java/sarsoo/fmframework/util/Maths.java
@@ -3,8 +3,6 @@ package sarsoo.fmframework.util;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.concurrent.TimeUnit;
-
 import sarsoo.fmframework.music.FMObj;
 
 public class Maths {