Bug fix: remove