Removed redundant codes