Edit validations updated, assets cleaned