Cleanup after merge
New feature in develop