Fixed target registering, target cleanup