removed some not-so-useful-to-me stuff