Some more bin/ cleanups