Removed useless template and prepared for tags