Replace powerline with airline; clean up