cleanup unneeded methods