Mostly clean up...removed methods for now