Removed redundant returns