Removed all redundant code