Clean up initial version