getting rid of unnecesary stuff that was causing bugs