Removing unnecessary cruft