clean up unnessiceray code