small cleanup
fix for remove device
removed some empty lines