#10: remove old and uncessary code