Clean up for non-dev building their own images