Commented and unused code removed