Modifications to stop simpleforwarding bundle at runtime