Split cleaner out
Bump to 0.3.3
Merge branch 'release/0.3.3' into develop