Simplify code and make it use our standard components Signed-off-by: Carl Schwan <carl@carlschwan.eu>