cleaned up for release