UPDATE: Removed redundant code