Fix import / cruft from fixes