Tidy up; Removed templates; Admin user checking;