Switch to autowp/bootstrap & cleanups