Remove missed junk; Rename for clarity;