Clean up dependencies and autoruns