general cleanup, removing test methods