Removed defaults from templates, fixed a bug in mkclean.