Remove unused stuff; better lightline