Changed jetpack to delta, removed certain hacks