Removed on{Entry,Leave} functions