Asd
Some cleanup