Removing the data class