Removed unneeded coded