Removing some unneeded methods