Removed redundant codes that are no longer in use