Removed redundant code!