Minor clean up; remove deprecated classes, methods