Clean up unneeded methods