Removed core from base templates