Cleanup after merge from develop