Cleaned up device editing method