[Ready] cleanups and fixes

 :baby: done