Cleaning up wrt panel boundaries