Removed commented code and templating remnants