-More code cleaning
-Removed State.java