Removed some old redundant code (that's never used)