Cleanup

Also, it’s 2014 now!