Bf/cleanup js