Cleanup and removal of redundant method calls.