various fixes

removed commented code