Removing client projects, few bugfixes