Some more - deleting obsolete code.