Started work on removing JailAPI