Feature 5 remove riviera buffers