Hardware: cleaned after rebase v2

I forgot one thing and pushed the changes - hence the second commit.