Cleanup and bugfix

Got rid of orphaned files, and fixed a bug that would sometimes cause
the eval frame to navigate when it shouldn't.