Removed references to methods not being used