BabyHares code cleanup