final clear up September 4th

final clear up September 4th