cleaning up for initial release