rm byebug and other refactors