Some needed clear up and removal of Tuple