Remove shit
Update things and move them around