Added licence to solution, removed some unnecessary stuff