Cleanup and back to version 0.20