Removing unused data type files.
Fix for S&A module due to changes in common place.