UP Spring Cleanup

By Scott