Revamped code
Secured Block Shop entity breakage (now actually deletes the entity)