update to 3.4 and cleanup