Add public to ignore
Remove excess data