Clean up for simplified distrobution.