Add ghost back, change a few others, remove unused devices