remove some old files
add code simplicity review