Removing embarassing unused code