Merge in removal of top.h (we don't use it, and it is causing issues on