version 1 complete - starting cleanup