Move resources and clean some old println