pr fixes, removed commented code