Remove unused files and perform some simple cleanups.
refactor shuttling, and modify order of shuttle transitions