Merge "ahal: removing unused libs"