Cleanup device parts

Add all missing parts & remove unused.