Removed unneded cruft