Removed some dead stuff
New templates