clean up in feature so update should work better