Cleanups - migrating code from place to place
Fixes