cleaned up some unneeded methods.