Remove a single system

will add few other tests on this pull request.