Cleaned things up for release 5.1