Shuffled new charsheet template into place

Also removed some other dead references
Started on db update script