Removed unneeded things