Fix warning, cleanup