General Clean up for next DEMO