Cleanup, fix templates and bans