Remove powerline and other stuff
Resolved merge conflicts