Removed stuff that's in powerline anyway