removed some unused methods and variables