Removed old unused types