CODE: Remove obsolete and non-functional check