Maven cleanups