cleaned up commentaries and unused code;