clean up - github duplicated code