update to work with mwtemplates, remove unecessary imports