remove rework and all its sillyness