[CLEANUP] squash commits and remove password info