Code cleanup
Removing solutions