[cleanup] code and git cleanup