Feature/remove visible

#381