What about costs of cleaning the house prior to our return and after the tenants moved out?
If at the time these costs were incurred you did not occupy the property and you had not taken a decision not to relet the property such costs are deductible.
Prima facie, if you did then in fact move back in as your residence this may suggest that this was always your intention and hence no deduction, but difficult for HMRC to prove this. An individual's intention at any point in time is always tricky to determine.