Remove obsolete bits