Feature/strip down