Removing some unused code