Core/Scripting: Cleaning of unused/obsolete stuff