Remove cruft in User package