Removed unused methods and modified tests