removed old data class