Deleted old unused code