Remove steps from model
refactored model to enforce KISS principles