Removed a couple of BCL dependencies