Remove redundant crap