Fix BL crashing, possibly breaks AccessTransformer
Revert change left from testing
Remove random commented out code