um delete function and refactor controller 65%