Remove block lock and some more unused things