Cleanup code
Solution settings