Removes current entity related logic and implements base of rule sets