less and templates cleanup