Removed unused packages and some unused variables. This will make warning
cleanup in eclipse a lot easier since I have to use eclipse to create jars with
libraries extracted