Feature/remove visible

#386