Removed unnecessary cruft