Temporary remove prepare part