Removed old (broken) variants