Cleaned up maven dependency spaghetti some more...