Cleanup and only build for 1.3