removed a lot of stupid junk