removing methods/classes no longer needed