Removed commented code; #141