Updated entity : remove function
Updated sample