Remove unnessesery cruft