additional cleanup: moved/deleted old or unused code