Now that most cleanup is done automatically the remove functions
can be significantly simplified.
Signed-off-by: NHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: NMark Brown <broonie@kernel.org>