Cleaning up some B Grade