Core/Misc: Missing changes and get rid of useless method in acd46085d1f496657e27e0d5f823f53d466702dc