General clean up
Walk through on failing to apply