Removing in Source refactored
* BUGRepair: removing strips shouldnt affect inserted ones
* Improved preserving of side effected expressions