Removal of historical code