Cleanup post-binary fiasco