Cleanups, prepare to merge with other project