clean up
remove icons
test it more