remove untested and deprecated methods