More ReadLine/ReadKey removals