Cleanup and configure for deploy