more cleanup, disabled vectors for first official release