removed all non-smach stuff