Cleanups for first version