Commented code removed