Cleans up cruft