removed unused methods and added some logs