Fixes last commit
Removes redundant code