Feature/afound 124 cleanup teaser