removing unnecessary cruft