Some cleanup

Started account removal