Cleanup solution + Update to Windsor 3.2