fixed some cleanup issues (more remaining)