#40. Remove obsolete code