Cleaning up old code
Release 0.6.1