Removed messy code for scrapped Always On option.