fixes for last commit
removed commented out code