Clean up of methods and fields where they are not used.