BLOC exporting was broke, fixed it + cleanup