Revert "commons + derby"

This reverts commit 17973ef7f452a95a31b09560cc9bc92fbf36c4a6.