Remove unneeded use
Remove cruft