Removed unneeded parts