Removed old unused code