Clean up from demo