Remove Device Control untill errors are fixed