Cleaning up the core capbash project