Removed unused method and variables