remove unused activities and layouts
add drawables, add before/after to flow