Clean up

Cleaning up things after last release (v1.1)