[WIP] Removed redundant and broken if