Cleaned up stale functions in commonfunctions