removed unused methods and fixed compilation issues