Simplify code, reduce code size, and drop remove function as no longer
needed.
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>