Clearing out some commented out methods