Cleaned up axi library.