Hopefully removed stuff that is uneccessary.