Cleaned up maven dependency spaghetti