Removed (probably) redundant code