Removing some old deprecated, unused classes