Cleanup for initial version