add components
cleanup