Cleaning right sidebar code up