Bring up to date with dev branch; and cleanup