Remove useless stuff. Fix stuff.....