refactorings; remove useless fragments
clean up