code cleanup, remove unneeded methods