cleanup and finalised