Remove the options for compatability reasons
Update changelog
Prepare 0.6.1 release