removed buncha junk so its not so cluttery