cleanup, ensuring inherited defined correctly, removing resource and collection methods