Eluna some forgot from sync

Signed-off-by: Salja <salja8840@gmail.com>
Eluna Removed NULL checks from methods
Eluna Moving methods and removing null checks