fix autocrap BDEPS and cleanup