Removed some more redundant code