fixed civic and removed cruft