[WIP] Removed redundant if condition