Gets rid of code cruft