Removed some unnecessary cruft