Cleaning Up unused code