Removed unuded parts