continued on the cleanup stuff