fixpu and cleanup