RuleEngine Swapping bug has been fixed and some useless old methods have been deleted