clean rubish
add divider
remove unused model
remove space