Removing excessive methods and includes.