Remove "remove" directive
Merge branch 'develop'
Bump version to 2.0.4 and update changelog