Getting rid of excessive methods