Removal of code that is no longer needed...