Removed unnecessory code