cleanup of common.sh