Core: Remove obsolete method
Core: Simplify code
Drop obsolete code
Remind bug #351