Pld/deploy cleanup