Remove obsoleted code