[IMP] kinesis_portal code cleaned up