cleaned some old methods