[trunk] Removing obsolete code