Epic commit
Admin toggle for admins
Cleanup after epic commit