Removing old unused code