Clean up code, remove unused code

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1692059 13f79535-47bb-0310-9956-ffa450edef68
5 files changed