Cleaning Up for new branch