cleanup templates somewhat, remove obsolete CSS stuff