Removed unused methods and added Static fields for less garbagecollection