cleaning up merge of develop