Cleanup

Bryce and Nick cleaning up.