Removed and cleaned more