Feature/chem spider cleanup