Remove unnecessary methods and method calls