remove completed and refactored