diff --git a/src/parser/hevc_parser.cpp b/src/parser/hevc_parser.cpp
index 07c6dc1627..824d680323 100644
--- a/src/parser/hevc_parser.cpp
+++ b/src/parser/hevc_parser.cpp
@@ -2029,7 +2029,7 @@ void HevcVideoParser::DecodeRps() {
         /// Short term reference pictures
         for (i = 0; i < num_poc_st_curr_before_; i++) {
             for (j = 0; j < HEVC_MAX_DPB_FRAMES; j++) {
-                if (poc_st_curr_before_[i] == dpb_buffer_.frame_buffer_list[j].pic_order_cnt) {
+                if (poc_st_curr_before_[i] == dpb_buffer_.frame_buffer_list[j].pic_order_cnt && dpb_buffer_.frame_buffer_list[j].use_status != kNotUsed) {
                     ref_pic_set_st_curr_before_[i] = j;  // RefPicSetStCurrBefore. Use DPB buffer index for now
                     dpb_buffer_.frame_buffer_list[j].is_reference = kUsedForShortTerm;
                     break;
@@ -2039,7 +2039,7 @@ void HevcVideoParser::DecodeRps() {
 
         for (i = 0; i < num_poc_st_curr_after_; i++) {
             for (j = 0; j < HEVC_MAX_DPB_FRAMES; j++) {
-                if (poc_st_curr_after_[i] == dpb_buffer_.frame_buffer_list[j].pic_order_cnt) {
+                if (poc_st_curr_after_[i] == dpb_buffer_.frame_buffer_list[j].pic_order_cnt && dpb_buffer_.frame_buffer_list[j].use_status != kNotUsed) {
                     ref_pic_set_st_curr_after_[i] = j;  // RefPicSetStCurrAfter
                     dpb_buffer_.frame_buffer_list[j].is_reference = kUsedForShortTerm;
                     break;
@@ -2049,7 +2049,7 @@ void HevcVideoParser::DecodeRps() {
 
         for ( i = 0; i < num_poc_st_foll_; i++ ) {
             for (j = 0; j < HEVC_MAX_DPB_FRAMES; j++) {
-                if (poc_st_foll_[i] == dpb_buffer_.frame_buffer_list[j].pic_order_cnt) {
+                if (poc_st_foll_[i] == dpb_buffer_.frame_buffer_list[j].pic_order_cnt && dpb_buffer_.frame_buffer_list[j].use_status != kNotUsed) {
                     ref_pic_set_st_foll_[i] = j;  // RefPicSetStFoll
                     dpb_buffer_.frame_buffer_list[j].is_reference = kUsedForShortTerm;
                     break;
diff --git a/src/parser/hevc_parser.h b/src/parser/hevc_parser.h
index b0922e25d0..c19e209e80 100644
--- a/src/parser/hevc_parser.h
+++ b/src/parser/hevc_parser.h
@@ -28,14 +28,6 @@ THE SOFTWARE.
 #include <map>
 #include <algorithm>
 
-//size_id = 0
-extern int scaling_list_default_0[1][6][16];
-//size_id = 1, 2
-extern int scaling_list_default_1_2[2][6][64];
-//size_id = 3
-extern int scaling_list_default_3[1][2][64];
-
-
 class HevcVideoParser : public RocVideoParser {
 
 public: