Feature/remove min