Clean up code for initial release