fixed errors after cleanup