Remove unneeded methods and dependencies