Fixes
Fixed source removal