removing code cruft