Cleanup merge of develop