[Refactor] Removed uneeded code

The removed code seemingly makes sense. But in practice, its not
needed and hence is being removed in favor of simplicity and preformance.