Removed unneeded Code