2.2.3 Pre-release and code cleanup