Removed templates and fixed general issues