Unimportant: removed redundant code