WIP
Remove redundant check