[1175] Core/Cleanup: just cleanup the core

Signed-off-by: Chiruclan <development@chiruclan.de>