Removed all unnescessary templates