Removed dublicated code