remove public where possible