[feature] Added mockup removal

Also fixed threading issues