cleaning up unnecessary *