Cleanup prior to devstart