Akababa cleanup
Latest commit 230f1ec Jun 21, 2017