clean up
removing obsolete methods