massive cleanup for prod server