dublicated

is already in the source
mac..

mac..
cleanup and lint checks

cleanup and lint checks