Remove DataType and Session