Cleaning up some New Years leftovers