Remove temporary solutions

Wrong naming scheme.
So let's start over.