Remove device and dialogs plugin requirements

Also deleted some old commented out code