remove unecessary PLp1BoundsError and clean up