Feature/removing usemin