cleanup + libwit in separate repo