Akikoo framework clean up