Remove maven-stuff
Merge branch 'solutions'