deleted useless class
streamlined code. needs testing to see if better
streamlined code. needs testing to see if better