v0.03a cleanup