Moved entity deletion into separate method for public access
Updated scheduling to use new method

Signed-off-by: Lucas Arnström <lucasarnstrom@gmail.com>