Removed cruft that shouldn't have been included
More cruft