Feature deploy cleanup (version 2)