cleanup, removed commented code