Tidy up and stupids removal
Merge branch 'release/0.0.3'