Deleted no longer needed class templates