Removed useless code from add/edit device screens.