Test and fix bug introduced in v1.2
Small cleanup
Delete unused methods