Clean up warnings and dependencies.