Cleanups, use feature in ::Common