Signal Bus cleanup and placement/breaking sanity