cleanup some handlebar problems