Cleanup some code for BLEN